babl: Don't declare functions with external linkage as inline

Don't declare functions with external linkage as inline. The way we
did it is forbidden in C99 and causes compilation problems on other
platforms. See bug #572154.

diff --git a/babl/babl-hash-table.c b/babl/babl-hash-table.c
index a468d4aa3af37fc48968d168f72a8439df86012d..a9c5debdd177383eed2633b9bd36f780cd5c9cd0 100644 (file)
--- a/babl/babl-hash-table.c
+++ b/babl/babl-hash-table.c
@@ -34,7 +34,7 @@ static void
 hash_rehash (BablHashTable *htab);
 
 
-inline int
+int
 babl_hash_by_str (BablHashTable *htab,
                   const char    *str)
 {
@@ -53,7 +53,7 @@ babl_hash_by_str (BablHashTable *htab,
   return (hash & htab->mask);
 }
 
-inline int
+int
 babl_hash_by_int (BablHashTable *htab,
                   int           id)
 {
@@ -137,7 +137,7 @@ hash_rehash (BablHashTable *htab)
   babl_free (nhtab);
 }
 
-inline int
+int
 babl_hash_table_size (BablHashTable *htab)
 {
     return htab->mask + 1;

diff --git a/babl/babl-hash-table.h b/babl/babl-hash-table.h
index ae296fbef2b80011dd5e3fc74e53ced120dd352f..881d1d612ec11075406c88144f77d9dea6f66bd3 100644 (file)
--- a/babl/babl-hash-table.h
+++ b/babl/babl-hash-table.h
@@ -44,15 +44,15 @@ BablHashTable *
 babl_hash_table_init (BablHashValFunction  hfunc,
                       BablHashFindFunction ffunc);
 
-inline int
+int
 babl_hash_by_str (BablHashTable *htab,
                   const char    *str);
 
-inline int
+int
 babl_hash_by_int (BablHashTable *htab,
                   int           id);
 
-inline int
+int
 babl_hash_table_size (BablHashTable *htab);
 
 int

diff --git a/babl/babl-list.c b/babl/babl-list.c
index 898e8c54f628d4e00ac5eec697c3e182feb830af..de254b1185ce6dc8ab3c0c0767eb22c504fb705a 100644 (file)
--- a/babl/babl-list.c
+++ b/babl/babl-list.c
@@ -68,7 +68,7 @@ babl_list_size (BablList *list)
     return list->count;
 }
 
-inline void
+void
 babl_list_insert_last (BablList *list,
                        Babl     *item)
 {
@@ -88,7 +88,7 @@ babl_list_insert_last (BablList *list,
     list->items[list->count++] = item;
 }
 
-inline void
+void
 babl_list_remove_last (BablList *list)
 {
   babl_assert (list);
@@ -97,7 +97,7 @@ babl_list_remove_last (BablList *list)
   list->count--;
 }
 
-inline Babl *
+Babl *
 babl_list_get_first (BablList *list)
 {
   babl_assert (list);
@@ -106,7 +106,7 @@ babl_list_get_first (BablList *list)
   return (list->items[0]);
 }
 
-inline Babl *
+Babl *
 babl_list_get_last (BablList *list)
 {
   babl_assert (list);
@@ -115,7 +115,7 @@ babl_list_get_last (BablList *list)
   return (list->items[list->count - 1]);
 }
 
-inline void
+void
 babl_list_copy (BablList *from,
                 BablList *to)
 {

diff --git a/babl/babl-list.h b/babl/babl-list.h
index d38eb6d853482fcc8370def3f313d227b368abbb..a339b1c71ca021626453dd070cc21ef5c6234e56 100644 (file)
--- a/babl/babl-list.h
+++ b/babl/babl-list.h
@@ -42,20 +42,20 @@ babl_list_destroy (BablList *list);
 int
 babl_list_size (BablList *list);
 
-inline void
+void
 babl_list_insert_last (BablList *list,
                        Babl     *item);
 
-inline void
+void
 babl_list_remove_last (BablList *list);
 
-inline Babl *
+Babl *
 babl_list_get_first (BablList *list);
 
-inline Babl *
+Babl *
 babl_list_get_last (BablList *list);
 
-inline void
+void
 babl_list_copy (BablList *from,
                 BablList *to);